Fix some nullable return annotations 2

diff --git a/gtk/gtkcenterlayout.c b/gtk/gtkcenterlayout.c
index ebf08172355eac565c9ab11f3f126df488047ef4..e43fb24f1bc7bc3bdfb2101b5941ca2c7723d0be 100644 (file)
--- a/gtk/gtkcenterlayout.c
+++ b/gtk/gtkcenterlayout.c
@@ -619,7 +619,7 @@ gtk_center_layout_get_baseline_position (GtkCenterLayout *self)
 /**
  * gtk_center_layout_set_start_widget:
  * @self: a #GtkCenterLayout
- * @widget: the new start widget
+ * @widget (nullable): the new start widget
  *
  * Sets the new start widget of @self.
  */
@@ -636,7 +636,7 @@ gtk_center_layout_set_start_widget (GtkCenterLayout *self,
  *
  * Returns the start widget fo the layout.
  *
- * Returns: (transfer none): The current start widget of @self
+ * Returns: (nullable) (transfer none): The current start widget of @self
  */
 GtkWidget *
 gtk_center_layout_get_start_widget (GtkCenterLayout *self)
@@ -647,7 +647,7 @@ gtk_center_layout_get_start_widget (GtkCenterLayout *self)
 /**
  * gtk_center_layout_set_center_widget:
  * @self: a #GtkCenterLayout
- * @widget: the new center widget
+ * @widget (nullable): the new center widget
  *
  * Sets the new center widget of @self
  */
@@ -664,7 +664,7 @@ gtk_center_layout_set_center_widget (GtkCenterLayout *self,
  *
  * Returns the center widget of the layout.
  *
- * Returns: (transfer none): the current center widget of @self
+ * Returns: (nullable) (transfer none): the current center widget of @self
  */
 GtkWidget *
 gtk_center_layout_get_center_widget (GtkCenterLayout *self)
@@ -675,7 +675,7 @@ gtk_center_layout_get_center_widget (GtkCenterLayout *self)
 /**
  * gtk_center_layout_set_end_widget:
  * @self: a #GtkCenterLayout
- * @widget: (transfer none): the new end widget
+ * @widget: (nullable) (transfer none): the new end widget
  *
  * Sets the new end widget of @self
  */
@@ -692,7 +692,7 @@ gtk_center_layout_set_end_widget (GtkCenterLayout *self,
  *
  * Returns the end widget of the layout.
  *
- * Returns: (transfer none): the current end widget of @self
+ * Returns: (nullable) (transfer none): the current end widget of @self
  */
 GtkWidget *
 gtk_center_layout_get_end_widget (GtkCenterLayout *self)

diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c
index afa51502697c5f479310411c7843e62ce5347981..f00bede003caffa871d66237537d5ef070782ff9 100644 (file)
--- a/gtk/gtkcolumnview.c
+++ b/gtk/gtkcolumnview.c
@@ -1661,7 +1661,7 @@ gtk_column_view_get_list_view (GtkColumnView *self)
  *   gtk_column_view_set_model (view, selection);
  * ]|
  *
- * Returns: (transfer none): the #GtkSorter of @self
+ * Returns: (nullable) (transfer none): the #GtkSorter of @self
  */
 GtkSorter *
 gtk_column_view_get_sorter (GtkColumnView *self)

diff --git a/gtk/gtkcolumnviewcolumn.c b/gtk/gtkcolumnviewcolumn.c
index d0fc25258224c460adae13475b62b90dac74ef81..51d03887073b0699c8f1bac20ab2639680a2141c 100644 (file)
--- a/gtk/gtkcolumnviewcolumn.c
+++ b/gtk/gtkcolumnviewcolumn.c
@@ -772,7 +772,7 @@ gtk_column_view_column_set_sorter (GtkColumnViewColumn *self,
  *
  * Returns the sorter that is associated with the column.
  *
- * Returns: (transfer none): the #GtkSorter of @self
+ * Returns: (nullable) (transfer none): the #GtkSorter of @self
  */
 GtkSorter *
 gtk_column_view_column_get_sorter (GtkColumnViewColumn *self)

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 94671bbc58ef95b9b712045ede2110d0967d2f03..30b4693078c1682c2a10599b1b1431d7b1a97cc6 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2142,7 +2142,7 @@ out:
  *
  * Returns the #GtkTreeModel which is acting as data source for @combo_box.
  *
- * Returns: (transfer none): A #GtkTreeModel which was passed
+ * Returns: (nullable) (transfer none): A #GtkTreeModel which was passed
  *     during construction.
  */
 GtkTreeModel *
@@ -2541,7 +2541,7 @@ gtk_combo_box_get_popup_fixed_width (GtkComboBox *combo_box)
  *
  * Returns the current row separator function.
  *
- * Returns: the current row separator function.
+ * Returns: (nullable): the current row separator function.
  */
 GtkTreeViewRowSeparatorFunc
 gtk_combo_box_get_row_separator_func (GtkComboBox *combo_box)
@@ -2556,7 +2556,7 @@ gtk_combo_box_get_row_separator_func (GtkComboBox *combo_box)
 /**
  * gtk_combo_box_set_row_separator_func:
  * @combo_box: a #GtkComboBox
- * @func: a #GtkTreeViewRowSeparatorFunc
+ * @func: (nullable): a #GtkTreeViewRowSeparatorFunc
  * @data: (allow-none): user data to pass to @func, or %NULL
  * @destroy: (allow-none): destroy notifier for @data, or %NULL
  *

diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c
index 166d108b3279ecf3eefbdd9f7a02e61a8516b1fe..ca69d15ffedc9f682376707c8fbf678ab67444a7 100644 (file)
--- a/gtk/gtkdragsource.c
+++ b/gtk/gtkdragsource.c
@@ -566,7 +566,7 @@ gtk_drag_source_new (void)
  *
  * Gets the current content provider of a #GtkDragSource.
  *
- * Returns: (transfer none): the #GdkContentProvider of @source
+ * Returns: (nullable) (transfer none): the #GdkContentProvider of @source
  */
 GdkContentProvider *
 gtk_drag_source_get_content (GtkDragSource *source)

diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 9006bea9e068f02a74163dde04b0b8d04f03fe6c..5ed128c4c2cc1e7c13e1caba932da2d517e0aefe 100644 (file)
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -795,7 +795,7 @@ gtk_header_bar_set_decoration_layout (GtkHeaderBar *bar,
  * Gets the decoration layout set with
  * gtk_header_bar_set_decoration_layout().
  *
- * Returns: the decoration layout
+ * Returns: (nullable): the decoration layout
  */
 const char *
 gtk_header_bar_get_decoration_layout (GtkHeaderBar *bar)